from trunk
authorKenichi Handa <handa@m17n.org>
Wed, 3 Mar 2010 06:04:00 +0000 (15:04 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 3 Mar 2010 06:04:00 +0000 (15:04 +0900)

Trivial merge